There has been a lont battle between Mary Kay and Michael Kors, over the use of the initials “MK.”

Now, the two companies made an agreement last week, in a peaceful settlement. The companies said that all aspects of the dispute had been compromised and settled, in a joint motion to toss the suit. No further details were given.

Michael Kors first tried to obtain the “MK” trademark in 2003, but Mary Kay challenged the application with the U.S. Patent and Trademark Office (USPTO) based on the cosmetic company’s prior registration of several “MK” marks.

Then in 2005, Michael Kors agreed not to use an “MK” mark to sell cosmetic products.

But in 2011, Mary Kay claimed that Michael Kors asked to modify the agreement – and allow it to a create a charm depicting an encircled “MK” mark. But according to the rules, Kors’ full name had to appear with the initials.

The battle continued when Mary Kay took the lawsuit to a Texas courtroom, over a year ago, when Michael Kors reportedly filed applications with the USPTO in an attempt to register the trademark “MK” for use on charms to be affixed to Estee Lauder cosmetic gift bags.

Mary Kay claimed this was in direct violation of the coexistence agreement the two companies struck, which only allows Mary Kay to use the MK trademark on makeup and other cosmetic goods.

Now it seems that the long battle has ended for good – and both parties have agreed to not bring up any more claims against the other.